Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump cosmos-sdk to v0.47.10-kava.2 with iavl v1 support (backport #1846) #1855

Merged
merged 1 commit into from
Mar 23, 2024
Merged

Bump cosmos-sdk to v0.47.10-kava.2 with iavl v1 support (backport #1846) #1855

merged 1 commit into from
Mar 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2024

Description

Checklist

  • Changelog has been updated as necessary.
This is an automatic backport of pull request #1846 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Mar 22, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Mar 22, 2024

Cherry-pick of 969614d has failed:

On branch mergify/bp/release/v0.26.x/pr-1846
Your branch is up to date with 'origin/release/v0.26.x'.

You are currently cherry-picking commit 969614d5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .tool-versions
	modified:   CHANGELOG.md
	modified:   Dockerfile
	modified:   Dockerfile-rocksdb

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@nddeluca nddeluca self-assigned this Mar 22, 2024
@nddeluca
Copy link
Member

I'll fix conflicts after merging #1854

@DracoLi @nddeluca
Bump cosmos-sdk to v0.47.10-kava.2 with iavl v1 support (#1846)
0a803dc 
* Bump to cosmos-sdk to v0.47.10-kava.2

* Update go version in dockerfile to 1.21

* Fix shard logic for iavl v1

* Update changelog

(cherry picked from commit 969614d)
@nddeluca nddeluca force-pushed the mergify/bp/release/v0.26.x/pr-1846 branch from 52f5023 to 0a803dc Compare March 22, 2024 23:13
@nddeluca nddeluca merged commit da8a4f8 into release/v0.26.x Mar 23, 2024
10 checks passed
@nddeluca nddeluca deleted the mergify/bp/release/v0.26.x/pr-1846 branch March 23, 2024 01:27
0g-wh pushed a commit to 0glabs/0g-chain that referenced this pull request Aug 3, 2024
@mergify @DracoLi @0g-wh
Bump cosmos-sdk to v0.47.10-kava.2 with iavl v1 support (Kava-Labs#1846…
1112134 
…) (Kava-Labs#1855)

* Bump to cosmos-sdk to v0.47.10-kava.2

* Update go version in dockerfile to 1.21

* Fix shard logic for iavl v1

* Update changelog

(cherry picked from commit 969614d)

Co-authored-by: Draco <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@DracoLi DracoLi

@nddeluca nddeluca

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nddeluca @DracoLi